Merge branch 'master' of git://git.denx.de/u-boot-video
authorTom Rini <[email protected]>
Tue, 26 Jan 2016 14:48:07 +0000 (09:48 -0500)
committerTom Rini <[email protected]>
Tue, 26 Jan 2016 14:48:07 +0000 (09:48 -0500)

Trivial merge